cleanup up and moved out build scripts