Implemented proper project structure.
More package layout changes.