New folder structure according to @renatomoya comment