Changed the directory tree

Using our own naming conventions