Full folder structure refactoring