Updating file layout to organize things better. 'root' was getting cluttered.