(#25) - Refactor filesystem layout