moved files into separate folders
temp fix for errors during bundle
fixed file paths for the new dir structure
fixed paths in tests for new dir structure
readme
Merge branch 'folder_structure'