Major restructuring: changed dirs into single module files, as per python standards.