Some changes to the directories name and hierarchy
Some clean up