Restructured

Resctructured most of the library