Major refactoring of code base to get rid of old implementation files