Avon 2.0

Big refactorings
New layout