Refactoring package structur and documentation