Added main files
Merge branch 'dev'