Restructure Kitkat build