basic start up stuff
Finished merge between the two. Merging over input, and the folders for organization