Restructure and small refactor