Add some module bootstraps for autoloading
Remove some redundant files