Fixed some organization stuff