Changed directory structure, added test code