Actual migration to AS

Now with file history!
Merge branch 'migrate_as2' into migrate_as