Refactored classes. Removed levels, since we don't have them anymore.