Project structure refatoring. For now, that's it.