Re-organizing folder structure, changes to README