Organized classes to function with app properly. Also started J Unit
testing on classes.