Renamed files and added optimisation to Makefile