removed home references
Cleaned up move to /opt