Fix permissions on data directory if they are wrong
Better directory naming