Rename launcher layout to be correct
Combine all into one Gradle module