Moved includes to the includes folder, added some shit