Slight refactoring
Some files deleted