Made everything compile into one jar file and added functionality. Also made it more extendable for future changes.