Split out agnular files, cleaned some rough edges