Reorganized, got packaging working on arch.