A little project re-structuring and Readme file update