Refactoring make system & updating TODO and README