Moved Aw files again
Fixed libaw build