Changed folder structure to accomodate the launcher