Organise files, add makefile