fixed sources, reorganized src