Making system more modular.
Removed file