restructure builds for easier maintenance
Updates for kitkat