Getting rid of modules. Causing more problems than solving