Fixed folder structure
Merge branch 'intial' into initial
Fixed everything up from the merge