Remove some files, start refactoring