Fixes for file's organization