Restructured the Home dir