move to 'fs' organization on Semaphore