Cleaned Up Source Code & Added Skeleton Mains

Making the information in each class more coherent. Like organizing the
methods and making it more readable.