Moved relevant files into config and lib folders for better organization