made a semantic directory structure and adjusted the code everywhere needed.