Organizational Changes

Made the code easier on the eyes. Organization is still incomplete.