re-orgaised file stucture