Rewrite Buffer test
Create folders for internals
Reorganize tests