Restructure, refactor and reorganize