Moved scattered files into proper folder structure