Simplified setup, tidied up files