Merge @dhortela and @dcelisgarza changes, as well as clean up folder structure, add more structures, homologate function names.