Restructure

All files rearranged and updated.