MAJOR update for Best Practice folder structure