Refactor files into folders
Add support for config file