added more structure for redesign - #49