Better naming and formating [tiny].
More layouting work, update README.