Fixed dependencies, removed superluous files