1) Made a few cosmetic fixed
2) Moved Core under lib