Re-formatted directories

Switched the different versions into different branches