cleanup strict code & reorganized filestructure