Cleaning up sources...

Updated Readme (since I didn't edit it properly)
Cleaned up the code organization of it a bit.