Fixed version
Re-structured project.