Reorganising directory structure
Problem importing
Reorganising structure. Tests renamed for nosetests.