Cleaned up packages and classes.. Trying to wrap needed classes