Restructure completely to use one base module
Restructure files (remove old directories)