Refactorings, appassembler plugin added