Changed design and added license headers