Update build and structure for AS 0.5.1