Moved files out of their own directory

Resolves #7