size reduction and re-ordering of some files

Note: research speed tree