Sorted out file structure and removed unwanted files.