Got rid of old files and rearranged all headers

Signed-off-by: shrimpboyho <shrimpboyhoftw@gmail.com>