Minor changes to organize file system