Altered file structure, rewrote pieces of JS, hopefully fixed client issues