Restructed most of the things
Kevin is coming