Re org project to multiple modules