huge renaming...
structure cleaned