Updated code structure for simplicity

. #133