Readme update & project cleanup