Restructure
Improved build script