Moved Files around

Reorganized the file structure
Merge commit 'b86606cc6b6077ac56c64de6c541795280ddc48a'