Better file structure & naming.