Updated tree and added standalone build process