More work on refactor

I promise things will become more simple soon...
Work on updating packages