Directory cleanup
Restructured files