Great code clean up!
Final changes, pkg preparing and testing!!!