change file names to prevent mix up
remove unused
change folders for testing purpose