More structure added, various changes