Moved the custom annotatiuons to a more proper package