refactored working directory

Signed-off-by: Johannes Tandler <jakefoly@gmail.com>