refactor: Move files into proper component folders
refactor: Rename files, remove artifacts