Major refactoring. 'file' storage type now named 'filesystem'