Move some files to subdirectories
Restructuring code to fit NPM module structure