Improved: file re-org and spec location.