fixed some file organization issues