Removed extra files and fixed file structure.