Seperated Included Files

Move files inlcuded into the primary files into seperate directory