gulp, bower, package all updated - restructured some stuff