V4.0 fix folder structure and added post build