Cleanup/reorganized