Moved some files

Improved #18