Group source code into packages. Add first annotation module