Moved stuff

My last commit but stuff in different folders, which I suspect would
cause problems for you guys. I gotta play with my IDE so it uploads to
the right spot. Hopefully moving stuff solves problems, instead of
creating more :p