Changed Structure

Changed structure of the project for one more not killeable.