Adding several new classes, narrowing down final structure