Cleaned up files and folder structure.