Initial commit of partly adapted project