Re-writing assembly files and cleanup unused files