Major FileSystem restructure to logically separate areas