getting rid of ugly hack and using folder name based on username