Created a proper module folder and moved test code to its own file