Structure changes, readme update