Organized classes better
Work towards #2