moving files and sorting code into branches