Renamed some folders and modules, updated gradle build files