Fixed some errors with refactoring and file names