Almost finish project default structure
merge master branch