changed folder structure. less modularized