Update file structure and add in directories for testing and samples