Modified project with properly folder