Begin code reorganization
Change README