Give API stuff it's own package for the buildscript. Also chnaged some stuff