Cleanup code; rename files