Re-organizing files and adding tests
Editing README