Housecleaning

Cleaned up the files and folder hierarchy.