cleaned up structure
final structure organization