v0.5.7 Refactorization, cleaned imports and permissions