General: Huge restructuring of packages directory structure. Pathes etc. are broken at this commit.