base functionality working

and removed/renamed unnecessary/indescript files