New folder structure + test + gulp