Included package data for setup and some extra dependencies, reorganized some templates