Fix directories and general integrations of files