Changed project structure a little.