Improved architecture and layout of Target class

Target's now built much better, and so are all the associated classes and peices.