Better file structure and includes