Move to os project structure