Rearrange domain files/diretories
Merge pull request #452 from Jonathanm10/master

Rearrange domain files/diretories