setting up sheffield package, rearranging sourcecode