Added a before annotation with a validation for instants
Restructure the package hierarchy slightly