Move everything in right place and fix license header.