Reorganization
Better build scripts