Project Restructurization

Further enhancement of the overall project structure by introducing nested
packages.