Added config file/organized stuff