Better structure and project file