changed name's pattern for subfolder
added half of test :) and did small refactoring