Fixed Folder Namings and License