Fixed file structure.
Cleanup