Moved the 'servlet' package
Moved the REST API to the proper package