Changes in software design will eventually mean "one step forward, two steps back". It is inevitable.