Clean up files and folder structure