Fix some naming and project structure issues