Added astronomy category, changed user directory scheme