Refactor structure src folder