Started refactoring of folder structure