Cleaned up the structure (still TODO)...