Moved everything around to meet Mirus directory structure requirements