Renamed to src and tests folders