Remove AMS.swp, add submodule AMS

Cleanup and add submodule linked to AMS