changed to one File.hpp not idiotic rwfile, moved Dir to correct place, changes to File