Issue 25 - folder organization