Proper directory structure, updating namespace