Removed Glacier and cleaned up organization