Initial commit
base file structure
fixed conflict