#4 reverted changes to existing classes, moved changes to new files