Removing archetype classes.
Updated junit dependency to use 4.4.