build: Small reorganization with build scripts

Change-Id: Icf0f681b947e975dbbb396f4ae81139601864e25