Simplification, reorganization

3 files modified and 1 file added