moved all files into base dir