Reorganized file structure
Updated README