Refactored classes to public