Modify File Structure. Isolate each module to each file.