Refactors organization a bit