Dissolving "api" module, step 1
Changing package names
Finish reorganizing project and renaming packages