moved source a level up and tidied tree