Reorganized files and folder structure.