Directory cleanup

Directory orginization