Started to tidy up code
Changed status dir name