Moved to right directories, refactored a part of Vertere