Better source code structure