Migrate to AMP 4.0.0 and update file structure