Refactor to organized namespace