Splitting files and other updates, working version