Changed everything around again. I think this will be what I run with. Sorry if this is a huge commit, I kinda messed up and had to re-do this folder.