Cleaned up filesystem module