Refactored several packages and moved classes.