New module project structure
Put test modules in their own file