Global refactor, change directory organisation