Updated structure

Updated code structure to follow guidelines