Fixed some file organization problems