Clean working set. Old files moved to separate branch