Remove an unusable file
Some layout improvements and rename some files