Tidied folder structure
Merge branch '7-tidy-folders'

Conflicts:
	package.json