New project structure. Do not use a commons package anymore.