Renamed directories to avoid prefixes with commands
Make data directory configurable by pgdata