Replace the direct x vector logic and organize the files more