Moving classes to it's own directory so this is cleaner