Closes #6

Removed the separation of the ejb stuff which was never used.