Fixed folder namings and license