Restructured project to be based on packages instead of everything in the root folder. Lot more organized now.