Update ASDF file, clean up code and add Admin module