Refactored the structure and added a Modulefile.