Move files from root to appropriate folders

Solves:
#972
#977
#978