HEAVY refactoring of folder structure