Cleaning up files and reorganize