Initial checkin of file structure
Fixed merge conflicts