fuck up files correctly & import fix