Simplified classes. Use 2 repos. Pkg build