Reorganized, got rid of design stuff