Everything is now in separate directory