Move private classes inside object
Move to separate package