File reorganization + new funcional test