Update structure
Add more aliases
Remove remnants
Make README more concise