organized all files in a modular way