restructuring
restructuring and playing around with specs2