Move to a better bash organisation