Reorganized src & bin directories