Moved some stuff around, cleaning up.
Moved functions files to includes folder.