Removed unused subpackages + restructured source tree