Restructure and fixes for release
Move file