Restructure and refactoring