Moved modules around and deleted some unused code