Moving files out of public and tidying up