Fixed intersection and "sticking" issue;
File structure cleaned up