Moved some stuff around the proj, for simplicity with plugins