Changed directory structure to conform to Python conventions.