Plenty of work to do.

Comiting current progress to prevent broken code later down the line (I changed the folder structure to be cleaner)