further refactoring, removing old files