Initial commit for FileMap & architecture changes in Shell