Reorganized everthing into folders