Better structure
Updated README