Better organizing the main Class