Restructuring
Cleaned up database design
Updated readme