Improved structure
README updates