Feature/reduce folder depth