rearranged files
revised
Merge pull request #15 from klaoha06/fix_modular_auth

rearranged files