restructure and cleanup area