restructure files a bit