Moved resources; added FileSystem