Readme update and new structuring