Moved all classes into an explicit package