Fixed some file organization