ticket:5 folder restructarization