ticket:1 more sence in folder structure