Initial efforts of refactoring / LGPL tagging