Rebuild and some grunt/config changes due to folder moves