Make project structure better