Small final refactoring, removed unnecessary files, ready to submit