Removed old way to handle modules. Will be using a package