Moved files around + minor changes.
Client architecture.