Added workspace sub directory
Fixed bug