Added new files and rearranged into folders