Move calc pos logic
Fix include header and type
Remove needless file and comments